[Libreoffice-commits] core.git: 27 commits - cui/source editeng/source reportdesign/source sc/source sd/source starmath/source svx/source sw/inc sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Sat Jul 26 05:26:11 PDT 2014
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/options/optcolor.cxx | 4
cui/source/options/optlingu.cxx | 4
cui/source/options/optpath.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 14
cui/source/tabpages/tpgradnt.cxx | 10
cui/source/tabpages/tphatch.cxx | 10
cui/source/tabpages/tplnedef.cxx | 10
cui/source/tabpages/tplneend.cxx | 8
editeng/source/misc/hangulhanja.cxx | 2
reportdesign/source/ui/dlg/dlgpage.cxx | 2
sc/source/ui/attrdlg/attrdlg.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 4
sc/source/ui/drawfunc/drawsh5.cxx | 8
sc/source/ui/styleui/styledlg.cxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/tabvwsh3.cxx | 2
sd/source/ui/dlg/dlgchar.cxx | 2
sd/source/ui/dlg/dlgpage.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4
sd/source/ui/view/drviews2.cxx | 12
starmath/source/view.cxx | 2
svx/source/dialog/grfflt.cxx | 12
svx/source/dialog/hdft.cxx | 4
svx/source/dialog/hyperdlg.cxx | 4
svx/source/dialog/imapwnd.cxx | 2
svx/source/dialog/srchdlg.cxx | 8
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/fmshell.cxx | 2
svx/source/gallery2/galbrws1.cxx | 8
svx/source/gallery2/galbrws2.cxx | 2
svx/source/svdraw/svdedtv2.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 4
sw/inc/expfld.hxx | 10
sw/inc/viewsh.hxx | 2
sw/source/core/fields/fldlst.cxx | 24 -
sw/source/core/view/vprint.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dialog/addrdlg.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/fldui/fldedt.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/frmdlg/pattern.cxx | 2
sw/source/ui/frmdlg/uiborder.cxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/table/convert.cxx | 2
sw/source/ui/table/instable.cxx | 2
sw/source/ui/table/tabledlg.cxx | 7
sw/source/uibase/app/appenv.cxx | 2
sw/source/uibase/app/applab.cxx | 4
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 6
sw/source/uibase/dialog/regionsw.cxx | 12
sw/source/uibase/dochdl/gloshdl.cxx | 24 -
sw/source/uibase/fldui/fldwrap.cxx | 4
sw/source/uibase/inc/gloslst.hxx | 12
sw/source/uibase/index/idxmrk.cxx | 4
sw/source/uibase/misc/redlndlg.cxx | 6
sw/source/uibase/ribbar/workctrl.cxx | 10
sw/source/uibase/shells/annotsh.cxx | 10
sw/source/uibase/shells/basesh.cxx | 20 -
sw/source/uibase/shells/drawdlg.cxx | 4
sw/source/uibase/shells/drawsh.cxx | 6
sw/source/uibase/shells/drwbassh.cxx | 10
sw/source/uibase/shells/drwtxtex.cxx | 10
sw/source/uibase/shells/frmsh.cxx | 18 -
sw/source/uibase/shells/tabsh.cxx | 12
sw/source/uibase/shells/textfld.cxx | 14
sw/source/uibase/shells/textglos.cxx | 8
sw/source/uibase/shells/textidx.cxx | 20 -
sw/source/uibase/shells/textsh.cxx | 25 -
sw/source/uibase/shells/textsh1.cxx | 63 +---
sw/source/uibase/shells/textsh2.cxx | 3
sw/source/uibase/shells/txtattr.cxx | 2
sw/source/uibase/shells/txtcrsr.cxx | 258 ++++++++++-------
sw/source/uibase/shells/txtnum.cxx | 10
sw/source/uibase/sidebar/PageMarginControl.cxx | 3
sw/source/uibase/smartmenu/stmenu.cxx | 7
sw/source/uibase/table/chartins.cxx | 3
sw/source/uibase/table/swtablerep.cxx | 18 -
sw/source/uibase/table/tablemgr.cxx | 2
sw/source/uibase/table/tablepg.hxx | 1
sw/source/uibase/uiview/pview.cxx | 48 +--
sw/source/uibase/uiview/srcview.cxx | 23 -
sw/source/uibase/uiview/uivwimp.cxx | 3
sw/source/uibase/uiview/view2.cxx | 57 +--
sw/source/uibase/uiview/viewdlg2.cxx | 6
sw/source/uibase/uiview/viewling.cxx | 6
sw/source/uibase/uiview/viewmdi.cxx | 20 -
sw/source/uibase/uiview/viewport.cxx | 6
sw/source/uibase/uiview/viewprt.cxx | 6
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 67 +---
sw/source/uibase/uno/unotxvw.cxx | 4
sw/source/uibase/utlui/content.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 4
sw/source/uibase/utlui/gloslst.cxx | 15
sw/source/uibase/utlui/numfmtlb.cxx | 2
sw/source/uibase/wrtsh/wrtsh2.cxx | 10
105 files changed, 578 insertions(+), 559 deletions(-)
New commits:
commit 20f6cf03770d8c5ca343287a42dc58df3091ef32
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Jul 26 14:23:59 2014 +0200
Massive 'Dialogdiet fail' and similar to 'Dialog creation failed'
Change-Id: I6ca6914e80c186699df42253de46a3690c5130f2
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index a63fba0..851f2c5 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -350,7 +350,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
if(pFact)
{
AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 2fea001..0d939748 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1156,10 +1156,10 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
OUString sName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton,
sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) );
- DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
aNameDlg->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 7ab82dd..1cd78d9 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1625,7 +1625,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
if(pFact)
{
AbstractSvxNewDictionaryDialog* aDlg = pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
uno::Reference< XDictionary > xNewDic;
if ( aDlg->Execute() == RET_OK )
xNewDic = uno::Reference< XDictionary >( aDlg->GetNewDictionary(), UNO_QUERY );
@@ -1661,7 +1661,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
if(pFact)
{
VclAbstractDialog* aDlg = pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
delete aDlg;
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index b69dbd8..2915d1b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -553,7 +553,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
{
AbstractSvxMultiPathDialog* pMultiDlg =
pFact->CreateSvxMultiPathDialog( this );
- DBG_ASSERT( pMultiDlg, "Dialogdiet fail!" );
+ DBG_ASSERT( pMultiDlg, "Dialog creation failed!" );
OUString sPath( sUser );
if ( !sPath.isEmpty() )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 2cfc700..c8d315b 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -432,7 +432,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
SVX_RES( RID_SVXSTR_BITMAP ),
CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aMessDlg, "Dialog creation failed!");
aMessDlg->SetButtonText( MESS_BTN_1, ResId( RID_SVXSTR_CHANGE, rMgr ) );
aMessDlg->SetButtonText( MESS_BTN_2, ResId( RID_SVXSTR_ADD, rMgr ) );
@@ -491,9 +491,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
MessageDialog* pWarnBox = NULL;
sal_uInt16 nError(1);
@@ -600,9 +600,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
OUString aName;
INetURLObject aURL( aDlg.GetPath() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
nError = 1;
while( pDlg->Execute() == RET_OK )
@@ -673,9 +673,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
OUString aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = pBitmapList->Count();
bool bDifferent = false;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 1fd7706..5314b37 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -267,7 +267,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
SVX_RESSTR( RID_SVXSTR_GRADIENT ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aMessDlg, "Dialog creation failed!");
aMessDlg->SetButtonText( MESS_BTN_1,
OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
aMessDlg->SetButtonText( MESS_BTN_2,
@@ -429,9 +429,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
MessageDialog* pWarnBox = NULL;
sal_uInt16 nError = 1;
@@ -520,9 +520,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
OUString aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = pGradientList->Count();
bool bDifferent = false;
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index f2d591e..f1ebdc6 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -244,7 +244,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
SVX_RESSTR( RID_SVXSTR_HATCH ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aMessDlg, "Dialog creation failed!");
aMessDlg->SetButtonText( MESS_BTN_1,
OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
aMessDlg->SetButtonText( MESS_BTN_2,
@@ -479,9 +479,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
MessageDialog* pWarnBox = NULL;
sal_uInt16 nError = 1;
@@ -564,9 +564,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
OUString aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = pHatchingList->Count();
bool bDifferent = false;
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index b2ddb14..92e3687 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -220,7 +220,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aMessDlg, "Dialog creation failed!");
aMessDlg->SetButtonText( MESS_BTN_1, OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
aMessDlg->SetButtonText( MESS_BTN_2, OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) );
@@ -544,9 +544,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
bool bLoop = true;
while ( bLoop && pDlg->Execute() == RET_OK )
@@ -622,9 +622,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
OUString aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = pDashList->Count();
bool bDifferent = false;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index c0264a7..da58cdb 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -332,9 +332,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
aWarningBox.Execute();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
bool bLoop = true;
while( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -447,9 +447,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
bool bLoop = true;
while ( bLoop && pDlg->Execute() == RET_OK )
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index b0287ce..26463307 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -287,7 +287,7 @@ namespace editeng
if(pFact)
{
m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection );
- DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");
+ DBG_ASSERT(m_pConversionDialog, "Dialog creation failed!");
m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() );
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 96d8645..f303c14 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -44,7 +44,7 @@ ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr, const
, rOutAttrs(*pAttr)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- assert(pFact && "Dialogdiet fail!");
+ assert(pFact && "Dialog creation failed!");
if (rDialog == "BackgroundDialog")
{
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 7979163..8c7c350 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -39,7 +39,7 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* p
{
SvtCJKOptions aCJKOptions;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
m_nNumberPageId = AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 );
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index ec6d47f..6994a24 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -383,13 +383,13 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
pView->MergeAttrFromMarked( aNewAttr, false );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet Factory fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
&aNewAttr,
pViewData->GetDocument()->GetDrawLayer(),
pObj,
bHasMarked));
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ OSL_ENSURE(pDlg, "Dialog creation failed!");
if ( nTabPage != 0xffff )
pDlg->SetCurPageId( nTabPage );
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 4cac58c..8294f68 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -487,9 +487,9 @@ void ScDrawShell::ExecDrawFunc( 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, ScDrawShell, NameObjectHdl));
@@ -556,9 +556,9 @@ void ScDrawShell::ExecDrawFunc( 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/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 0722fc8..4502b11 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -66,7 +66,7 @@ ScStyleDlg::ScStyleDlg( Window* pParent,
, m_nSheetId(0)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
switch ( nRscId )
{
case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 121a9cc..25fbbb2 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -653,7 +653,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq )
if(pFact)
{
boost::scoped_ptr<AbstractSvxZoomDialog> pDlg(pFact->CreateSvxZoomDialog(NULL, aSet));
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetLimits( 20, 400 );
pDlg->HideButton( ZOOMBTN_OPTIMAL );
bCancel = ( RET_CANCEL == pDlg->Execute() );
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 21a8a21..0676d43 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -664,7 +664,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if(pFact)
{
pDlg.reset(pFact->CreateSvxZoomDialog(GetDialogParent(), aSet ));
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ OSL_ENSURE(pDlg, "Dialog creation failed!");
}
if (pDlg)
{
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index a2a669a..b51394a 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -41,7 +41,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
mnCharName = AddTabPage( "RID_SVXPAGE_CHAR_NAME", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
mnCharEffects = AddTabPage( "RID_SVXPAGE_CHAR_EFFECTS", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index ff13713..e2be23d 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -55,7 +55,7 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet*
mpBitmapList = aBitmapListItem.GetBitmapList();
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
mnPage = AddTabPage( "RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 );
mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 );
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index fc868dd..6d5542a 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -130,7 +130,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
pBitmapList = aBitmapListItem.GetBitmapList();
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet fail!");
+ OSL_ENSURE(pFact, "Dialog creation failed!");
mnLine = AddTabPage( "RID_SVXPAGE_LINE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 );
mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 );
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 9bf97ee..a11e20a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -904,11 +904,11 @@ void SlotManager::RenameSlide (void)
OUString aPageName = pSelectedPage->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(
mrSlideSorter.GetContentWindow().get(),
aPageName, aDescr));
- DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true );
aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE );
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c3c49d2..c135ee37 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -450,9 +450,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
OUString aPageName = pCurrentPage->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
- DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE );
@@ -2121,9 +2121,9 @@ void DrawViewShell::FuTemporary(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, DrawViewShell, NameObjectHdl));
@@ -2154,9 +2154,9 @@ void DrawViewShell::FuTemporary(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/starmath/source/view.cxx b/starmath/source/view.cxx
index 95a6a65..3bfc64c 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1759,7 +1759,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
if(pFact)
{
pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet);
- SAL_WARN_IF( !pDlg, "starmath", "Dialogdiet fail!" );
+ SAL_WARN_IF( !pDlg, "starmath", "Dialog creation failed!" );
pDlg->SetLimits( MINZOOM, MAXZOOM );
if( pDlg->Execute() != RET_CANCEL )
pSet = pDlg->GetOutputItemSet();
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 4368ef5..7c45e38 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -79,7 +79,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSmooth(pWindow, rGraphic, 0.7));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
@@ -167,7 +167,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
@@ -180,7 +180,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
@@ -193,7 +193,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
@@ -231,7 +231,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
@@ -244,7 +244,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
if(pFact)
{
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
}
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index a01a559..da4790d 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -99,7 +99,7 @@ namespace svx {
if(pFact)
{
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector ));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
{
SfxItemIter aIter( *pDlg->GetOutputItemSet() );
@@ -681,7 +681,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
mbEnableBackgroundSelector,
mbEnableDrawingLayerFillStyles);
- DBG_ASSERT(pDlg,"Dialogdiet fail!");
+ DBG_ASSERT(pDlg,"Dialog creation failed!");
if(RET_OK == pDlg->Execute() && pDlg->GetOutputItemSet())
{
SfxItemIter aIter(*pDlg->GetOutputItemSet());
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 621e95c..f1e227d 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -54,9 +54,9 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
- DBG_ASSERT(mpDlg, "Dialogdiet fail!");
+ DBG_ASSERT(mpDlg, "Dialog creation failed!");
pWindow = mpDlg->GetWindow();
((MyStruct*)pImp)->bVisible = false;
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index dc6b290..c076a8c 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -674,7 +674,7 @@ void IMapWindow::DoPropertyDialog()
{
boost::scoped_ptr<AbstractURLDlg> aDlg(pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(),
pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList ));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if ( aDlg->Execute() == RET_OK )
{
const OUString aURLText( aDlg->GetURL() );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d59c090..0264cbb 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1292,7 +1292,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pSearchItem->GetLEVOther(),
pSearchItem->GetLEVShorter(),
pSearchItem->GetLEVLonger() ));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
if ( pDlg && pDlg->Execute() == RET_OK )
{
pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() );
@@ -1312,7 +1312,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
{
boost::scoped_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
pSearchItem->GetTransliterationFlags() ));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
int nRet = aDlg->Execute();
if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
{
@@ -1894,7 +1894,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
if(pFact)
{
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
aTxt = pDlg->GetText() + aTxt;
pDlg->SetText( aTxt );
@@ -1978,7 +1978,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl)
if(pFact)
{
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
PaintAttrText_Impl();
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 3139fd2..aa5d42b 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -861,7 +861,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if(pFact)
{
boost::scoped_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->SetColumns(xCols);
pDlg->Execute();
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 23a65c8..05abd279 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -759,7 +759,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
if ( pFact )
{
boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
- DBG_ASSERT( dlg.get(), "Dialogdiet fail!" );
+ DBG_ASSERT( dlg.get(), "Dialog creation failed!" );
dlg->SetValue( rController->getCursor()->getRow() );
if ( dlg->Execute() == RET_OK )
nRecord = dlg->GetValue();
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 3705fa9..414ef42 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -363,7 +363,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
if(pFact)
{
boost::scoped_ptr<VclAbstractRefreshableDialog> aActualizeProgress(pFact->CreateActualizeProgressDialog( this, pTheme ));
- DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");
+ DBG_ASSERT(aActualizeProgress, "Dialog creation failed!");
aActualizeProgress->Update();
aActualizeProgress->Execute();
@@ -385,9 +385,9 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
const OUString aOldName( pTheme->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldName ));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
{
@@ -423,7 +423,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
if(pFact)
{
boost::scoped_ptr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme ));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
pTheme->SetId( aDlg->GetId(), true );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index af7335b..2779824 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1207,7 +1207,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId )
if(pFact)
{
boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldTitle ));
- DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
{
OUString aNewTitle( aDlg->GetTitle() );
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index bb31717..cf03ff5 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -774,7 +774,7 @@ void SdrEditView::DistributeMarkedObjects()
if(pFact)
{
boost::scoped_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr));
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
sal_uInt16 nResult = pDlg->Execute();
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index ffa10be..eea2995 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -740,9 +740,9 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
const OUString aCropStr(SVX_RESSTR(RID_SVXSTR_GRAFCROP));
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- assert(pFact && "Dialogdiet error!");
+ assert(pFact && "Dialog creation failed!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
- assert(fnCreatePage && "Dialogdiet error!");
+ assert(fnCreatePage && "Dialog creation failed!");
SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog.get_content_area(), &aCropDlgAttr );
pTabPage->SetText( aCropStr );
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index c8878e7..5bc41d8 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 4cab3f7..de6538e 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 38df859..bb6c681 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 ae1f83c..b6e1215 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 2396a53..79e9e5a 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 4025f37..4ac2e10 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 26a28cf..7b0820b 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 29b5103..4d73684 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 5968d82..3589b91 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 29c1fc2..7b57568 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 56f669f..bc7348b 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 b0831e7..bc00cf9 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 9b39b1a..187029f 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 c0af214..cb31042 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 c291cd8..56e6c02 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 db393fa..ab8aa95 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 23c2e45..e7ed851 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 ab60671..8677662 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 8780c4b..deaaa7a 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 0f5e35d..c411cf2 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 938c552..91c0752d 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 b5c403b..3ab01b1 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 522d50f..36c29ac 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 306f554..3c23615 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 81444cd..10dbe3c 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 6ec91a8..afaad13 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 458de83..b70218b 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 57ab6e7..05d2a75 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 79d5960..4689117 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 c61bbe7..0c806c4 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 3efcc94..b60a316 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 bb6bfc3..62a430e 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 e58e37b6..7848b1c 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 237e747..c2cd28b 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 6e64edc..f4ffe1f 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 372416e..1987c36 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 e3a6d48..2d60b87 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 c3d3eda..e2fd0a2 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 0b84b55..fe5ceeb 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 65181a5..cda3f3b 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!");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list