From f41e7c704898fa0e86d6d128f5bd28f37c081e92 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 9 Aug 2013 14:20:59 +0100 Subject: convert SfxStyleDialogs to .ui Change-Id: I32aa538026669e22e0756cd062b72e67f8d179e5 --- sw/source/ui/shells/textsh1.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/ui/shells/textsh1.cxx') diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 80fe613a33be..4d0263198e11 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -209,7 +209,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } const SfxItemSet* pSet = NULL; @@ -966,9 +966,9 @@ void SwTextShell::Execute(SfxRequest &rReq) // Current page format ::SwToSfxPageDescAttr( aCoreSet ); - sal_uInt16 nDefPage = 0; - if( pItem ) - nDefPage = ((SfxUInt16Item *)pItem)->GetValue(); + OString sDefPage; + if (pItem) + sDefPage = OUStringToOString(((const SfxStringItem*)pItem)->GetValue(), RTL_TEXTENCODING_UTF8); // Properties of numbering if( rWrtSh.GetDoc()->GetCurrNumRule( *pPaM->GetPoint() ) ) @@ -986,7 +986,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, sal_False, nDefPage ); + pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, sal_False, sDefPage ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); } SfxItemSet* pSet = NULL; -- cgit v1.2.3