diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-26 14:23:59 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-26 14:25:33 +0200 |
commit | 20f6cf03770d8c5ca343287a42dc58df3091ef32 (patch) | |
tree | dbcbfa94c38def0078c100a8d900699312329135 /sw | |
parent | 044159d82d8551a41c1ffad9fe897932f64e8d39 (diff) |
Massive 'Dialogdiet fail' and similar to 'Dialog creation failed'
Change-Id: I6ca6914e80c186699df42253de46a3690c5130f2
Diffstat (limited to 'sw')
50 files changed, 144 insertions, 144 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index c8878e798282..5bc41d8206e6 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -70,7 +70,7 @@ SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, SetText(GetText() + SW_RESSTR(STR_TEXTCOLL_HEADER) + *pStr + ")"); } SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); m_nCharStdId = AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), 0); m_nCharExtId = AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0); m_nCharPosId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 4cab3f7c7f4a..de6538e72c4b 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -35,7 +35,7 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet) { // Create TabPage SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ); if ( fnCreatePage ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 38df859ee57c..bb6c6819566f 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -738,7 +738,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTblSet, &rSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute() ) pTblSet->Put( *pDlg->GetOutputItemSet() ); else if( bNewSet ) @@ -756,7 +756,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFmt)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFmtOfIndex( pTAutoFmt ); return 0; diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index ae1f83cc479c..b6e12153cc53 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -25,7 +25,7 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL ); if ( fnCreatePage ) { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 2396a53570bc..79e9e5a8fe30 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1396,7 +1396,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog( , m_pSectionData(0) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); m_nSectionPageId = AddTabPage("section", SwInsertSectionTabPage::Create, 0); m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create, 0); m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0); @@ -2044,7 +2044,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( , rWrtSh(rSh) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create, 0); m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); m_nNotePageId = AddTabPage("notes", SwSectionFtnEndTabPage::Create, 0); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 4025f3703b8f..4ac2e1063e0d 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -259,7 +259,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) const OUString sFmtStr = pColl->GetName(); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFmtStr)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { SfxItemSet aOutputSet( *pDlg->GetOutputItemSet() ); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 26a28cfd866e..7b0820bff7a7 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl) boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_ADDR )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { pSh->UpdateFlds( *pCurFld ); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 29b5103c13e0..4d73684c86ea 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -116,7 +116,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell()); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); // tinker TabPages together switch( nRegion ) { diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 5968d8214fc8..3589b91c28f4 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -99,7 +99,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, m_nColumnId = AddTabPage("columns", SwColumnPage::Create, 0); } SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); //UUUU remove? // m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0); diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 29c1fc276f18..7b57568c25e8 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -29,7 +29,7 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) { SetText(SW_RESSTR(STR_FRMUI_PATTERN)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); if ( fnCreatePage ) { diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 56f669f4b5b2..bc7348b8dd3d 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -36,7 +36,7 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : SetText(SW_RESSTR(STR_FRMUI_BORDER)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ); if ( fnCreatePage ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b0831e782a35..bc00cf989977 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -295,7 +295,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet } } SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); m_nSelectId = AddTabPage("index", SwTOXSelectTabPage::Create, 0); m_nStylesId = AddTabPage("styles", SwTOXStylesTabPage::Create, 0); m_nColumnId = AddTabPage("columns", SwColumnPage::Create, 0); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9b39b1a1f0ef..187029f3fefc 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -1011,7 +1011,7 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn ) if(pFact) { boost::scoped_ptr<AbstractSvxMultiPathDialog> pDlg(pFact->CreateSvxPathSelectDialog(pBtn)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); SvtPathOptions aPathOpt; const OUString sGlosPath( aPathOpt.GetAutoTextPath() ); pDlg->SetPath(sGlosPath); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index c0af214b553b..cb31042c14de 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -183,7 +183,7 @@ IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFmt)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFmtOfIndex( pTAutoFmt ); return 0; diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index c291cd8dd571..56e6c02f36c7 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -190,7 +190,7 @@ IMPL_LINK( SwInsTableDlg, AutoFmtHdl, PushButton*, pButton ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFmt)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFmtOfIndex( pTAutoFmt ); return 0; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index db393fab76f2..ab8aa95b237d 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1207,7 +1207,7 @@ SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&, , m_nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell())) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); AddTabPage("table", &SwFormatTablePage::Create, 0); m_nTextFlowId = AddTabPage("textflow", &SwTextFlowPage::Create, 0); AddTabPage("columns", &SwTableColumnPage::Create, 0); diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index 23c2e45e449f..e7ed851b5225 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -215,7 +215,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwEnvDlg( pParent, aSet, pOldSh, pTempPrinter, !bEnvChange )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); nMode = pDlg->Execute(); } else diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index ab606712eeb8..867766228951 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -106,7 +106,7 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem if(!rItem.bSynchron || !(nCol|nRow)) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); if ( fnSetActGroup ) (*fnSetActGroup)( rItem.sGlossaryGroup ); @@ -179,7 +179,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) NULL, #endif bLabel)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( RET_OK == pDlg->Execute() ) { diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 8780c4b7db75..deaaa7a825b0 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -685,7 +685,7 @@ void SwDocShell::Execute(SfxRequest& rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwInsertAbstractDlg> pDlg(pFact->CreateSwInsertAbstractDlg(0)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { sal_uInt8 nLevel = pDlg->GetLevel(); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 0f5e35d86e0f..c411cf291b15 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2394,7 +2394,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, pFound = FindDSConnection(sDataSource, true); } SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); pImpl->pMergeDialog = pFact->CreateMailMergeDlg( DLG_MAILMERGE, &rSh.GetView().GetViewFrame()->GetWindow(), rSh, sDataSource, @@ -2402,7 +2402,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, nCmdType, xConnection, bWithDataSourceBrowser ? 0 : &aSelection); - OSL_ENSURE(pImpl->pMergeDialog, "Dialogdiet fail!"); + OSL_ENSURE(pImpl->pMergeDialog, "Dialog creation failed!"); if(pImpl->pMergeDialog->Execute() == RET_OK) { aDescriptor[daSelection] <<= pImpl->pMergeDialog->GetSelection(); @@ -2568,7 +2568,7 @@ void SwDBManager::InsertText(SwWrtShell& rSh, xSource, xColSupp, aDBData )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute() ) { OUString sDummy; diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index 938c5525e5a4..91c0752d4b3c 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -82,10 +82,10 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) // height=width for more consistent preview (analog to edit region) aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog( &GetView().GetViewFrame()->GetWindow(), aSet , rSh)); - OSL_ENSURE(aTabDlg, "Dialogdiet fail!"); + OSL_ENSURE(aTabDlg, "Dialog creation failed!"); aTabDlg->Execute(); rReq.Ignore(); } @@ -192,10 +192,10 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect ) // height=width for more consistent preview (analog to edit region) aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog( &pThis->GetView().GetViewFrame()->GetWindow(),aSet , *pThis)); - OSL_ENSURE(aTabDlg, "Dialogdiet fail!"); + OSL_ENSURE(aTabDlg, "Dialog creation failed!"); aTabDlg->SetSectionData(*xSectionData); aTabDlg->Execute(); } @@ -218,9 +218,9 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) Window* pParentWin = &GetView().GetViewFrame()->GetWindow(); { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractEditRegionDlg> pEditRegionDlg(pFact->CreateEditRegionDlg(pParentWin, rWrtShell)); - OSL_ENSURE(pEditRegionDlg, "Dialogdiet fail!"); + OSL_ENSURE(pEditRegionDlg, "Dialog creation failed!"); if(pItem && pItem->ISA(SfxStringItem)) { pEditRegionDlg->SelectSection(((const SfxStringItem*)pItem)->GetValue()); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index b5c403beb36c..3ab01b141698 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -75,9 +75,9 @@ typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr; void SwGlossaryHdl::GlossaryDlg() { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); boost::scoped_ptr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(pViewFrame, this, pWrtShell)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); OUString sName; OUString sShortName; @@ -361,9 +361,9 @@ bool SwGlossaryHdl::ExpandGlossary() OSL_ENSURE(pWrtShell->CanInsert(), "illegal"); SwTextBlocks *pGlossary; SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); ::GlossaryGetCurrGroup fnGetCurrGroup = pFact->GetGlossaryCurrGroupFunc(); - assert(fnGetCurrGroup && "Dialogdiet fail!"); + assert(fnGetCurrGroup && "Dialog creation failed!"); OUString sGroupName( (*fnGetCurrGroup)() ); if (sGroupName.indexOf(GLOS_DELIM)<0) FindGroupName(sGroupName); @@ -450,7 +450,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(0, aShortName)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); for(sal_uInt16 i = 0; i < aFoundArr.size(); ++i) { TextBlockInfo_Impl* pData = &aFoundArr[i]; diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 522d50f3214a..36c29ac1b46f 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -84,7 +84,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId, SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert(pFact && "SwAbstractDialogFactory fail!"); AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlgInterface = pDlg; pWindow = pDlg->GetWindow(); pDlg->Start(); @@ -129,7 +129,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 n OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlgInterface = pDlg; pWindow = pDlg->GetWindow(); diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index 306f55448e69..3c2361593473 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -63,7 +63,7 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert(pFact && "SwAbstractDialogFactory fail!"); pAbstDlg = pFact->CreateIndexMarkFloatDlg(pBindings, this, pParentWindow, pInfo); - assert(pAbstDlg && "Dialogdiet fail!"); + assert(pAbstDlg && "Dialog creation failed!"); pWindow = pAbstDlg->GetWindow(); pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg() // -> Show() will invoke StateChanged() and save pos @@ -93,7 +93,7 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pAbstDlg = pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow, pInfo); - OSL_ENSURE(pAbstDlg, "Dialogdiet fail!"); + OSL_ENSURE(pAbstDlg, "Dialog creation failed!"); pWindow = pAbstDlg->GetWindow(); eChildAlignment = SFX_ALIGN_NOALIGNMENT; diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 81444cddc8ee..10dbe3c9377f 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1062,9 +1062,9 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc(); - OSL_ENSURE(fnGetRange, "Dialogdiet fail! GetRanges()"); + OSL_ENSURE(fnGetRange, "Dialog creation failed! GetRanges()"); SfxItemSet aSet( pSh->GetAttrPool(), fnGetRange() ); aSet.Put(SvxPostItTextItem(sComment, SID_ATTR_POSTIT_TEXT)); @@ -1075,7 +1075,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) SID_ATTR_POSTIT_DATE )); boost::scoped_ptr<AbstractSvxPostItDialog> pDlg(pFact->CreateSvxPostItDialog( pParentDlg, aSet, false )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->HideAuthor(); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 6ec91a84f11b..afaad13a1d75 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -254,7 +254,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); if ( fnSetActGroup ) (*fnSetActGroup)( sGroup ); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 458de83db224..b70218b6efca 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -419,7 +419,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(rView.GetWindow(), rView.GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); break; } @@ -427,10 +427,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { SfxItemSet aTmp(GetPool(), FN_PARAM_1, FN_PARAM_1); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, rView.GetWindow(), &aTmp, rView.GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); @@ -486,7 +486,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (nSlot == SID_CHAR_DLG_EFFECT) { pDlg->SetCurPageId("fonteffects"); @@ -535,7 +535,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, 0, true )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) { diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 57ab6e7256be..05d2a7508222 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -822,7 +822,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwConvertTableDlg> pDlg(pFact->CreateSwConvertTableDlg(GetView(), bToTable)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute() ) { pDlg->GetValues( cDelim, aInsTblOpts, pTAFmt ); @@ -2402,7 +2402,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_TABLE, RC_DLG_SWBORDERDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetTabBorders( *pDlg->GetOutputItemSet() ); @@ -2419,7 +2419,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_FRAME, RC_DLG_SWBORDERDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { aMgr.SetAttrSet( *pDlg->GetOutputItemSet() ); @@ -2437,7 +2437,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_PARA, RC_DLG_SWBORDERDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetAttrSet( *pDlg->GetOutputItemSet() ); @@ -2469,7 +2469,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) pDlg.reset(pFact->CreateSfxDialog( pMDI, aSet, rView.GetViewFrame()->GetFrame().GetFrameInterface(), RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); aSet.Put( aBrush ); if ( pDlg->Execute() == RET_OK ) { @@ -2487,7 +2487,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) pDlg.reset(pFact->CreateSfxDialog( pMDI, aSet, rView.GetViewFrame()->GetFrame().GetFrameInterface(), RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetFlyFrmAttr((SfxItemSet &) *pDlg->GetOutputItemSet() ); @@ -2502,7 +2502,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) pDlg.reset(pFact->CreateSfxDialog( pMDI, aSet, rView.GetViewFrame()->GetFrame().GetFrameInterface(), RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetAttrSet( *pDlg->GetOutputItemSet() ); @@ -2611,9 +2611,9 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) if( !nCols || !nRows ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractInsTableDlg> pDlg(pFact->CreateInsTableDlg(rTempView)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute() ) { pDlg->GetValues( aTableName, nRows, nCols, aInsTblOpts, aAutoName, pTAFmt ); @@ -2827,7 +2827,7 @@ void SwBaseShell::ExecField( SfxRequest& rReq ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwChangeDBDlg(GetView())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx index 79d5960b2b0f..468911748c79 100644 --- a/sw/source/uibase/shells/drawdlg.cxx +++ b/sw/source/uibase/shells/drawdlg.cxx @@ -118,13 +118,13 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet Factory fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( NULL, &aNewAttr, pDoc, pObj, bHasMarked)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { pSh->StartAction(); diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index c61bbe757a34..0c806c4b768e 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -307,7 +307,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), GetView().GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); break; } @@ -315,10 +315,10 @@ void SwDrawShell::Execute(SfxRequest &rReq) { SfxItemSet aTmp(GetPool(), FN_PARAM_1, FN_PARAM_1); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, GetView().GetWindow(), &aTmp, GetView().GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 3efcc94a07e3..b60a3169df00 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -153,7 +153,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { @@ -525,9 +525,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) OUString aName(pSelected->GetName()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->SetCheckNameHdl(LINK(this, SwDrawBaseShell, CheckGroupShapeNameHdl)); @@ -555,9 +555,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) OUString aDescription(pSelected->GetDescription()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index bb6bfc3cf58d..62a430eabeab 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -325,7 +325,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(pView->GetWindow(), *pView, aDlgAttr, DLG_CHAR_DRAW)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); if (nSlot == SID_CHAR_DLG_EFFECT) { pDlg->SetCurPageId("fonteffects"); @@ -349,7 +349,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), rView.GetWrtShell())); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); break; } @@ -357,10 +357,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) { SfxItemSet aTmp(GetPool(), FN_PARAM_1, FN_PARAM_1); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, GetView().GetWindow(), &aTmp, GetView().GetWrtShell())); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); @@ -422,7 +422,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, 0, true )); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index e58e37b680a8..7848b1c0c45e 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -243,7 +243,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), GetView().GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); break; } @@ -251,10 +251,10 @@ void SwFrameShell::Execute(SfxRequest &rReq) { SfxItemSet aTmp(GetPool(), FN_PARAM_1, FN_PARAM_1); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, GetView().GetWindow(), &aTmp, GetView().GetWrtShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); @@ -497,7 +497,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) )); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog( nSel & nsSelectionType::SEL_GRF ? "PictureDialog" : nSel & nsSelectionType::SEL_OLE ? "ObjectDialog": @@ -507,7 +507,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) aSet, false, false, sDefPage)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( nSlot == FN_DRAW_WRAP_DLG ) { @@ -655,12 +655,12 @@ void SwFrameShell::Execute(SfxRequest &rReq) OUString aTitle(rSh.GetObjTitle()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg( pFact->CreateSvxObjectTitleDescDialog( NULL, aTitle, aDescription )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { @@ -1288,13 +1288,13 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq) rSh.GetFlyFrmAttr(aNewAttr); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet Factory fail!"); + DBG_ASSERT(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( NULL, &aNewAttr, pDoc, false)); - DBG_ASSERT(pDlg, "Dialogdiet fail!"); + DBG_ASSERT(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 237e747da04e..c2cd28b4770f 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -566,7 +566,7 @@ void SwTableShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwTableTabDlg(GetView().GetWindow(), GetPool(), &aCoreSet, &rSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pItem) pDlg->SetCurPageId(OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8)); @@ -648,7 +648,7 @@ void SwTableShell::Execute(SfxRequest &rReq) boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet, pView->GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_SWNUMFMTDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (RET_OK == pDlg->Execute()) { @@ -793,7 +793,7 @@ void SwTableShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(&GetView().GetViewFrame()->GetWindow(), &rSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; @@ -803,7 +803,7 @@ void SwTableShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_ROW_HEIGHT )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; @@ -959,7 +959,7 @@ void SwTableShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSplitTableDialog> pDlg(pFact->CreateSplitTblDialog( GetView().GetWindow(), rSh )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, pDlg->GetSplitMode() ) ); bCallDone = true; @@ -977,7 +977,7 @@ void SwTableShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateTblMergeDialog(GetView().GetWindow(), bPrev)); - OSL_ENSURE(pDlg, "dialogdiet pDlg fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK != pDlg->Execute()) bPrev = bNext = false; } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 6e64edceb9b5..f4ffe1fd511a 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -138,7 +138,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwFldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG )); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); } } @@ -427,9 +427,9 @@ void SwTextShell::ExecField(SfxRequest &rReq) bool bTravel = false; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); ::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc(); - assert(fnGetRange && "Dialogdiet fail! GetRanges()"); + assert(fnGetRange && "Dialog creation failed! GetRanges()"); SfxItemSet aSet(GetPool(), fnGetRange()); aSet.Put(SvxPostItTextItem(sComment, SID_ATTR_POSTIT_TEXT)); aSet.Put(SvxPostItAuthorItem(pRedline->GetAuthorString(), SID_ATTR_POSTIT_AUTHOR)); @@ -472,9 +472,9 @@ void SwTextShell::ExecField(SfxRequest &rReq) bTravel |= bNext || bPrev; SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create(); - assert(pFact2 && "Dialogdiet fail!"); + assert(pFact2 && "Dialog creation failed!"); boost::scoped_ptr<AbstractSvxPostItDialog> pDlg(pFact2->CreateSvxPostItDialog( pMDI, aSet, bTravel )); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlg->HideAuthor(); OUString sTitle(SW_RES(STR_REDLINE_COMMENT)); @@ -534,9 +534,9 @@ void SwTextShell::ExecField(SfxRequest &rReq) else { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); boost::scoped_ptr<AbstractJavaEditDialog> pDlg(pFact->CreateJavaEditDialog(pMDI, &rSh)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); if ( pDlg->Execute() ) { aType = pDlg->GetScriptType(); diff --git a/sw/source/uibase/shells/textglos.cxx b/sw/source/uibase/shells/textglos.cxx index 372416e49cbd..1987c36ceb3d 100644 --- a/sw/source/uibase/shells/textglos.cxx +++ b/sw/source/uibase/shells/textglos.cxx @@ -72,7 +72,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) aShortName = (( const SfxStringItem *)pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); if ( fnSetActGroup ) (*fnSetActGroup)( aGroup ); @@ -88,7 +88,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) { OUString aGroup = (( const SfxStringItem *)pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); if ( fnSetActGroup ) (*fnSetActGroup)( aGroup ); @@ -104,7 +104,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem )) aName = (( const SfxStringItem *)pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc(); if ( fnSetActGroup ) (*fnSetActGroup)( aGroup ); diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx index e3a6d48d8010..2d60b874f375 100644 --- a/sw/source/uibase/shells/textidx.cxx +++ b/sw/source/uibase/shells/textidx.cxx @@ -57,9 +57,9 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) case FN_EDIT_AUTH_ENTRY_DLG : { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( pMDI, GetShell(), DLG_EDIT_AUTHMARK)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; @@ -83,18 +83,18 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) if(aMgr.GetTOXMarkCount() > 1) { // Several marks, which should it be? SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); VclAbstractDialog* pMultDlg = pFact->CreateMultiTOXMarkDlg(pMDI, aMgr); - OSL_ENSURE(pMultDlg, "Dialogdiet fail!"); + OSL_ENSURE(pMultDlg, "Dialog creation failed!"); nRet = pMultDlg->Execute(); delete pMultDlg; } if( nRet == RET_OK) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateIndexMarkModalDlg(pMDI, GetShell(), aMgr.GetCurTOXMark())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; @@ -138,11 +138,11 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) aSet.Put(*pSet); } SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog( pMDI, aSet, rSh, (SwTOXBase* )pCurTOX, USHRT_MAX, bGlobal)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } break; diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index c3d3eda5e672..e2fd0a2871d3 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -607,12 +607,12 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, GetView().GetDocShell())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("FrameDialog", GetView().GetViewFrame(), &GetView().GetViewFrame()->GetWindow(), aSet, true)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet()) { //local variable necessary at least after call of .AutoCaption() because this could be deleted at this point @@ -660,9 +660,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_FORMAT_COLUMN : { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN)); - OSL_ENSURE(pColDlg, "Dialogdiet fail!"); + OSL_ENSURE(pColDlg, "Dialog creation failed!"); pColDlg->Execute(); } break; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 0b84b5589ede..fe5ceeb976f6 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -175,7 +175,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwCharDlg(rWrtSh.GetView().GetWindow(), rWrtSh.GetView(), aCoreSet, DLG_CHAR_STD)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if( FN_INSERT_HYPERLINK == nSlot ) pDlg->SetCurPageId("hyperlink"); } @@ -448,10 +448,10 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_INSERT_FOOTNOTE_DLG: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg( GetView().GetWindow(), rWrtSh, false)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand()); if ( pDlg->Execute() == RET_OK ) { @@ -473,7 +473,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), rWrtSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); break; } @@ -535,7 +535,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwBreakDlg> pDlg(pFact->CreateSwBreakDlg(GetView().GetWindow(), rWrtSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { nKind = pDlg->GetKind(); @@ -593,7 +593,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwInsertBookmarkDlg( GetView().GetWindow(), rWrtSh, rReq, DLG_INSERT_BOOKMARK )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } @@ -625,7 +625,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwModalRedlineAcceptDlg> pDlg(pFact->CreateSwModalRedlineAcceptDlg(&GetView().GetEditWin())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); switch (lcl_AskRedlineMode(&GetView().GetEditWin())) { @@ -689,7 +689,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rWrtSh, DLG_SORTING )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); @@ -699,10 +699,10 @@ void SwTextShell::Execute(SfxRequest &rReq) { SfxItemSet aTmp(GetPool(), FN_PARAM_1, FN_PARAM_1); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, GetView().GetWindow(), &aTmp, rWrtSh)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); pDlg.reset(); rReq.Done(); @@ -978,7 +978,7 @@ void SwTextShell::Execute(SfxRequest &rReq) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, false, sDefPage )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); } SfxItemSet* pSet = NULL; if ( !bUseDialog ) diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 65181a52c21d..cda3f3b4e225 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -442,7 +442,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { rSh.StartAction(); diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index 89f0c04343b8..2e71deff6df6 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -183,10 +183,10 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET, GetView().GetWindow(), &aSet, GetShell())); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); const short nRet = pDlg->Execute(); const SfxPoolItem* pItem; if ( RET_OK == nRet ) diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index b8d309822879..e0eda8c281df 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -56,7 +56,7 @@ void SwTableFUNC::ColWidthDlg( Window *pParent ) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwTableWidthDlg(pParent, *this)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); } diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index f539de3bd8a2..f57bc069c5f8 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -761,7 +761,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) if(pFact) { pDlg.reset(pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); } pDlg->SetLimits( MINZOOM, MAXZOOM ); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 9ab43267bcd4..ebd7db0b4305 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -533,9 +533,9 @@ void SwView::Execute(SfxRequest &rReq) case FN_LINE_NUMBERING_DLG: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclSwViewDialog(*this)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->Execute(); break; } @@ -1136,9 +1136,9 @@ void SwView::Execute(SfxRequest &rReq) { SfxViewFrame* pTmpFrame = GetViewFrame(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); AbstractMailMergeCreateFromDlg* pDlg = pFact->CreateMailMergeCreateFromDlg(&pTmpFrame->GetWindow()); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) bUseCurrentDocument = pDlg->IsThisDocument(); else @@ -2329,9 +2329,9 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) { //take an existing data source or create a new one? SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); AbstractMailMergeFieldConnectionsDlg* pConnectionsDlg = pFact->CreateMailMergeFieldConnectionsDlg(&GetViewFrame()->GetWindow()); - OSL_ENSURE(pConnectionsDlg, "Dialogdiet fail!"); + OSL_ENSURE(pConnectionsDlg, "Dialog creation failed!"); if(RET_OK == pConnectionsDlg->Execute()) bCallAddressPilot = !pConnectionsDlg->IsUseExistingConnections(); else diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 3852fc191a58..ff168a0b6f65 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -57,7 +57,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq) assert(pFact && "SwAbstractDialogFactory fail!"); boost::scoped_ptr<VclAbstractDialog> pDialog(pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION )); - assert(pDialog && "Dialogdiet fail!"); + assert(pDialog && "Dialog creation failed!"); if ( pDialog ) { pDialog->Execute(); @@ -67,10 +67,10 @@ void SwView::ExecDlgExt(SfxRequest &rReq) case FN_EDIT_FOOTNOTE: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg( pMDI, *m_pWrtShell, true)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand()); pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) ); diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index d72d0def58ef..57477a0a3661 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -122,7 +122,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti boost::scoped_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(NULL, *pDocShell, pInStream.get())); - OSL_ENSURE(pAsciiDlg, "Dialogdiet fail!"); + OSL_ENSURE(pAsciiDlg, "Dialog creation failed!"); if(RET_OK == pAsciiDlg->Execute()) { SwAsciiOptions aOptions; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 85af262c34a7..70e6e2246b43 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3248,7 +3248,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractSwRenameXNamedDlg> pDlg(pFact->CreateSwRenameXNamedDlg(this, xNamed, xNameAccess)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(xSecond.is()) pDlg->SetAlternativeAccess( xSecond, xThird); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index a61f9d644be2..34fdd1c27fdb 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -879,14 +879,14 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry 0); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - assert(pFact && "Dialogdiet fail!"); + assert(pFact && "Dialog creation failed!"); boost::scoped_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog( this, aSet, *pActiveShell, 0, USHRT_MAX, true)); - assert(pDlg && "Dialogdiet fail!"); + assert(pDlg && "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { SwTOXDescription& rDesc = pDlg->GetTOXDescription( diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 58ee5385abd1..05648f09230f 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -399,7 +399,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet, GetView()->GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_SWNUMFMTDLG )); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if (RET_OK == pDlg->Execute()) { diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 4062aef7f9a7..4ea08d500929 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -195,9 +195,9 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractFldInputDlg> pDlg(pFact->CreateFldInputDlg(pParentWin, *this, pFld, bNextButton)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pWindowState && !pWindowState->isEmpty()) pDlg->SetWindowState(*pWindowState); @@ -224,7 +224,7 @@ bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* p OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); boost::scoped_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pFld, bNextButton)); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pWindowState && !pWindowState->isEmpty()) pDlg->SetWindowState(*pWindowState); const short nRet = pDlg->Execute(); |