diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/app/docst.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/docvw/HeaderFooterWin.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/docvw/PageBreakWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 633 | ||||
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.src | 373 | ||||
-rw-r--r-- | sw/source/ui/inc/swuipardlg.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/tmpdlg.hxx | 41 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/annotsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/basesh.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewmdi.cxx | 9 |
16 files changed, 390 insertions, 745 deletions
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 6e0594ffdce1..18095f96427a 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -73,7 +73,6 @@ #include "unochart.hxx" #include "app.hrc" -#include <fmtui.hrc> #include "swabstdlg.hxx" #include <list.hxx> @@ -620,7 +619,7 @@ sal_uInt16 SwDocShell::Edit( const sal_uInt16 nFamily, sal_uInt16 nMask, const sal_Bool bNew, - const sal_uInt16 nSlot, + const OString sPage, SwWrtShell* pActShell, const sal_Bool bBasic ) { @@ -785,7 +784,7 @@ sal_uInt16 SwDocShell::Edit( SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); SfxAbstractApplyTabDialog* pDlg = pFact->CreateTemplateDialog( - 0, *(xTmp.get()), nFamily, nSlot, + 0, *(xTmp.get()), nFamily, sPage, pActShell ? pActShell : pWrtShell, bNew); OSL_ENSURE(pDlg, "Dialogdiet fail!"); ApplyStyle aApplyStyleHelper(*this, bNew, pStyle, nRet, xTmp, nFamily, pDlg, mxBasePool, bModified); @@ -1314,10 +1313,10 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrent void SwDocShell::FormatPage( const String& rPage, - const sal_uInt16 nSlot, + const OString& rPageId, SwWrtShell& rActShell ) { - Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, nSlot, &rActShell); + Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 20b4f957de30..7686e40b77d7 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -50,7 +50,7 @@ SwParaDlg::SwParaDlg(Window *pParent, sal_uInt8 nDialogMode, const String *pTitle, sal_Bool bDraw, - sal_uInt16 nDefPage) + OString sDefPage) : SfxTabDialog(pParent, "ParagraphPropertiesDialog", "modules/swriter/ui/paradialog.ui", @@ -162,8 +162,8 @@ SwParaDlg::SwParaDlg(Window *pParent, m_nParaBorder = AddTabPage("labelTP_BORDER", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); } - if (nDefPage) - SetCurPageId(nDefPage); + if (!sDefPage.isEmpty()) + SetCurPageId(sDefPage); } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ea0dd39b5e2c..5192ddb8b333 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -32,7 +32,6 @@ #include "dochdl.hrc" #include <index.hrc> #include <regionsw.hrc> -#include <fmtui.hrc> #include <wordcountdialog.hxx> #include "abstract.hxx" // add for SwInsertAbstractDlg @@ -822,9 +821,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pP sal_uInt8 nDialogMode, const String *pCollName, sal_Bool bDraw , - sal_uInt16 nDefPage) + OString sDefPage) { - SfxTabDialog* pDlg = new SwParaDlg( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, nDefPage ); + SfxTabDialog* pDlg = new SwParaDlg( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, sDefPage ); return new AbstractTabDialog_Impl( pDlg ); } @@ -987,11 +986,11 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - const sal_uInt16 nSlot, + OString sPage, SwWrtShell* pActShell, - sal_Bool bNew ) //add for SwTemplateDlg + bool bNew ) //add for SwTemplateDlg { - SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, nSlot, pActShell, bNew ); + SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, sPage, pActShell, bNew ); return new AbstractApplyTabDialog_Impl( pDlg ); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index e0060494ef55..3d2c25a7e89a 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -468,7 +468,7 @@ public: sal_uInt8 nDialogMode, const String *pCollName = 0, sal_Bool bDraw = sal_False, - sal_uInt16 nDefPage = 0); + OString sDefPage = OString() ); virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName); //add for SwSelGlossaryDlg virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg @@ -501,10 +501,10 @@ public: virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, - sal_uInt16 nRegion, - const sal_uInt16 nSlot = 0, + sal_uInt16 nRegion, + OString sPage = OString(), SwWrtShell* pActShell = 0, - sal_Bool bNew = sal_False ); //add for SwTemplateDlg + bool bNew = false); //add for SwTemplateDlg virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); //add for SwGlossaryDlg diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index b4b7ec708fd4..edb65e6b7b64 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -401,13 +401,8 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) { case FN_HEADERFOOTER_EDIT: { - sal_uInt16 nPageId = TP_FOOTER_PAGE; - if ( m_bIsHeader ) - nPageId = TP_HEADER_PAGE; - - rView.GetDocShell()->FormatPage( - rStyleName, - nPageId, rSh ); + OString sPageId = m_bIsHeader ? OString("header") : OString("footer"); + rView.GetDocShell()->FormatPage(rStyleName, sPageId, rSh); } break; case FN_HEADERFOOTER_BORDERBACK: diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index e61c90132b63..507f3f556038 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -243,7 +243,7 @@ void SwPageBreakWin::Select( ) SwPaM aPaM( *pNd ); SwPaMItem aPaMItem( pEditWin->GetView().GetPool( ).GetWhich( FN_PARAM_PAM ), &aPaM ); - SfxUInt16Item aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), TP_PARA_EXT ); + SfxStringItem aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), "textflow" ); pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, &aPaMItem, NULL ); } diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 7ad860ec76c9..7e977dc8173c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -55,7 +55,6 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <fmtui.hrc> #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> @@ -73,23 +72,51 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); Description: the dialog's carrier --------------------------------------------------------------------*/ -SwTemplateDlg::SwTemplateDlg(Window* pParent, +SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, - sal_uInt16 nRegion, - const sal_uInt16 nSlot, - SwWrtShell* pActShell, - sal_Bool bNew ) : - SfxStyleDialog( pParent, - SW_RES(DLG_TEMPLATE_BASE + nRegion), - rBase, - sal_False, - 0 ), - nType( nRegion ), - pWrtShell(pActShell), - bNewStyle(bNew) + sal_uInt16 nRegion, + OString sPage, + SwWrtShell* pActShell, + bool bNew) + : SfxStyleDialog(pParent, + OString("TemplateDialog") + OString::number(nRegion), + OUString("modules/swriter/ui/templatedialog") + + OUString::number(nRegion) + OUString(".ui"), + rBase) + , nType(nRegion) + , pWrtShell(pActShell) + , bNewStyle(bNew) + , m_nIndentsId(0) + , m_nAlignId(0) + , m_nTextFlowId(0) + , m_nAsianTypo(0) + , m_nFontId(0) + , m_nFontEffectId(0) + , m_nPositionId(0) + , m_nAsianLayoutId(0) + , m_nTabId(0) + , m_nOutlineId(0) + , m_nDropCapsId(0) + , m_nBackgroundId(0) + , m_nBorderId(0) + , m_nConditionId(0) + , m_nTypeId(0) + , m_nOptionsId(0) + , m_nWrapId(0) + , m_nColumnId(0) + , m_nMacroId(0) + , m_nHeaderId(0) + , m_nFooterId(0) + , m_nPageId(0) + , m_nFootNoteId(0) + , m_nTextGridId(0) + , m_nSingleId(0) + , m_nBulletId(0) + , m_nNumId(0) + , m_nBmpId(0) + , m_nNumOptId(0) + , m_nNumPosId(0) { - FreeResource(); - nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell()); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -101,136 +128,134 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); + m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); + m_nFontEffectId = AddTabPage("fonteffect", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + m_nPositionId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); + m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )); SAL_WARN_IF(!pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageCreatorFunc fail!"); SAL_WARN_IF(!pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); SvtCJKOptions aCJKOptions; if(nHtmlMode & HTMLMODE_ON || !aCJKOptions.IsDoubleLinesEnabled()) - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("asianlayout"); } break; // paragraph styles case SFX_STYLE_FAMILY_PARA: { - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); - - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nIndentsId = AddTabPage("indents", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nAlignId = AddTabPage("alignment", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!"); + m_nTextFlowId = AddTabPage("textflow", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); + m_nAsianTypo = AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!"); + m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); + m_nFontEffectId = AddTabPage("fonteffect", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); - AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!"); + m_nPositionId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!"); + m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); - AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); - + m_nTabId = AddTabPage("tabs", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); - AddTabPage(TP_NUMPARA, SwParagraphNumTabPage::Create, + m_nOutlineId = AddTabPage("outline", SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); - AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, + m_nDropCapsId = AddTabPage("dropcaps", SwDropCapsPage::Create, SwDropCapsPage::GetRanges ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage( TP_CONDCOLL, SwCondCollPage::Create, + m_nConditionId = AddTabPage("condition", SwCondCollPage::Create, SwCondCollPage::GetRanges ); if( (!bNewStyle && RES_CONDTXTFMTCOLL != ((SwDocStyleSheet&)rBase).GetCollection()->Which()) || nHtmlMode & HTMLMODE_ON ) - RemoveTabPage(TP_CONDCOLL); + RemoveTabPage("condition"); SvtCJKOptions aCJKOptions; if(nHtmlMode & HTMLMODE_ON) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); if (!rHtmlOpt.IsPrintLayoutExtension()) - RemoveTabPage(TP_PARA_EXT); - RemoveTabPage(TP_PARA_ASIAN); - RemoveTabPage(TP_TABULATOR); - RemoveTabPage(TP_NUMPARA); - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("textflow"); + RemoveTabPage("asiantypo"); + RemoveTabPage("tabs"); + RemoveTabPage("outline"); + RemoveTabPage("asianlayout"); if(!(nHtmlMode & HTMLMODE_FULL_STYLES)) { - RemoveTabPage(TP_BACKGROUND); - RemoveTabPage(TP_DROPCAPS); + RemoveTabPage("background"); + RemoveTabPage("dropcaps"); } } else { if(!aCJKOptions.IsAsianTypographyEnabled()) - RemoveTabPage(TP_PARA_ASIAN); + RemoveTabPage("asiantypo"); if(!aCJKOptions.IsDoubleLinesEnabled()) - RemoveTabPage(TP_CHAR_TWOLN); + RemoveTabPage("asianlayout"); } } break; // frame styles case SFX_STYLE_FAMILY_FRAME: { - AddTabPage(TP_FRM_STD, SwFrmPage::Create, - SwFrmPage::GetRanges ); - AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, - SwFrmAddPage::GetRanges ); - AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, - SwWrapTabPage::GetRanges ); + m_nTypeId = AddTabPage("type", SwFrmPage::Create, + SwFrmPage::GetRanges); + m_nOptionsId = AddTabPage("options", SwFrmAddPage::Create, + SwFrmAddPage::GetRanges); + m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, + SwWrapTabPage::GetRanges); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, SwColumnPage::Create, + m_nColumnId = AddTabPage("columns", SwColumnPage::Create, SwColumnPage::GetRanges ); - AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); + m_nMacroId = AddTabPage("macros", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); break; } @@ -239,74 +264,52 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)), - SvxHeaderPage::Create, - SvxHeaderPage::GetRanges ); - AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)), - SvxFooterPage::Create, - SvxFooterPage::GetRanges ); - if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG ) - { - SetCurPageId(TP_COLUMN); - } - else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG ) - { - SetCurPageId(TP_PAGE_STD); - } + m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); + m_nHeaderId = AddTabPage("header", SvxHeaderPage::Create, SvxHeaderPage::GetRanges); + m_nFooterId = AddTabPage("footer", SvxFooterPage::Create, SvxFooterPage::GetRanges); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)), + m_nPageId = AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), - pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), - sal_False, - 1 ); // after the manage-page + pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell())) { OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)), + m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)), - SwColumnPage::Create, - SwColumnPage::GetRanges ); - AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)), + m_nColumnId = AddTabPage("columns", SwColumnPage::Create, SwColumnPage::GetRanges ); + m_nFootNoteId = AddTabPage("footnotes", SwFootNotePage::Create, SwFootNotePage::GetRanges ); - AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)), + m_nTextGridId = AddTabPage("textgrid", SwTextGridPage::Create, SwTextGridPage::GetRanges ); SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsAsianTypographyEnabled()) - RemoveTabPage(TP_TEXTGRID_PAGE); + RemoveTabPage("textgrid"); } - - } break; // numbering styles case SFX_STYLE_FAMILY_PSEUDO: { - AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); - AddTabPage( RID_SVXPAGE_PICK_BULLET ); - AddTabPage( RID_SVXPAGE_PICK_NUM ); - AddTabPage( RID_SVXPAGE_PICK_BMP); - AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); - AddTabPage( RID_SVXPAGE_NUM_POSITION ); - + m_nSingleId = AddTabPage("numbering", RID_SVXPAGE_PICK_SINGLE_NUM); + m_nBulletId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET); + m_nNumId = AddTabPage("outline", RID_SVXPAGE_PICK_NUM); + m_nBmpId = AddTabPage("graphics", RID_SVXPAGE_PICK_BMP); + m_nNumOptId = AddTabPage("options", RID_SVXPAGE_NUM_OPTIONS ); + m_nNumPosId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION ); } break; default: OSL_ENSURE(!this, "wrong family"); - } - EnableApplyButton( true ); -} -SwTemplateDlg::~SwTemplateDlg() -{ + if (!sPage.isEmpty()) + SetCurPageId(sPage); } short SwTemplateDlg::Ok() @@ -351,233 +354,215 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch( nId ) + if (nId == m_nFontId) { - case TP_CHAR_STD: - { - OSL_ENSURE(::GetActiveView(), "no active view"); - - SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()-> - GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ); - - aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); - sal_uInt32 nFlags = 0; - if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON )) - nFlags = SVX_RELATIVE_MODE; - if( SFX_STYLE_FAMILY_CHAR == nType ) - nFlags = nFlags|SVX_PREVIEW_CHARACTER; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); - rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_EXT: - { - sal_uInt32 nFlags = SVX_ENABLE_FLASH; - if( SFX_STYLE_FAMILY_CHAR == nType ) - nFlags = nFlags|SVX_PREVIEW_CHARACTER; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + OSL_ENSURE(::GetActiveView(), "no active view"); + + SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()-> + GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ); + + aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); + sal_uInt32 nFlags = 0; + if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON )) + nFlags = SVX_RELATIVE_MODE; + if( SFX_STYLE_FAMILY_CHAR == nType ) + nFlags = nFlags|SVX_PREVIEW_CHARACTER; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + rPage.PageCreated(aSet); + } + else if (nId == m_nFontEffectId) + { + sal_uInt32 nFlags = SVX_ENABLE_FLASH; + if( SFX_STYLE_FAMILY_CHAR == nType ) + nFlags = nFlags|SVX_PREVIEW_CHARACTER; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); + rPage.PageCreated(aSet); + } + else if (nId == m_nPositionId) + { + if( SFX_STYLE_FAMILY_CHAR == nType ) + { + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_POS: - if( SFX_STYLE_FAMILY_CHAR == nType ) - { - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); - rPage.PageCreated(aSet); - } - break; - - case TP_CHAR_TWOLN: - if( SFX_STYLE_FAMILY_CHAR == nType ) - { - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); - rPage.PageCreated(aSet); - } - break; - - case TP_PARA_STD: - { - if( rPage.GetItemSet().GetParent() ) - { - aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,MM50/10)); - aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,0x000F)); - rPage.PageCreated(aSet); - } - - } - break; - case TP_NUMPARA: - { - //-->#outlinelevel added by zhaojianwei - // handle if the current paragraph style is assigned to a list level of outline style, - SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() ); - if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() ) - { - ((SwParagraphNumTabPage&)rPage).DisableOutline() ; - ((SwParagraphNumTabPage&)rPage).DisableNumbering(); - }//<-end - ListBox & rBox = ((SwParagraphNumTabPage&)rPage).GetStyleBox(); - SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); - const SfxStyleSheetBase* pBase = pPool->First(); - std::set<String> aNames; - while(pBase) - { - aNames.insert(pBase->GetName()); - pBase = pPool->Next(); - } - for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it) - rBox.InsertEntry(*it); } - break; - case TP_PARA_ALIGN: - { - aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); - rPage.PageCreated(aSet); - } - break; - - case TP_FRM_STD: - ((SwFrmPage&)rPage).SetNewFrame( sal_True ); - ((SwFrmPage&)rPage).SetFormatUsed( sal_True ); - break; - - case TP_FRM_ADD: - ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True); - ((SwFrmAddPage&)rPage).SetNewFrame(sal_True); - break; - - case TP_FRM_WRAP: - ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False ); - break; - - case TP_COLUMN: - if( nType == SFX_STYLE_FAMILY_FRAME ) - ((SwColumnPage&)rPage).SetFrmMode(sal_True); - ((SwColumnPage&)rPage).SetFormatUsed( sal_True ); - break; - - case TP_BACKGROUND: + } + else if (nId == m_nAsianLayoutId) + { + if( SFX_STYLE_FAMILY_CHAR == nType ) { - sal_Int32 nFlagType = 0; - if( SFX_STYLE_FAMILY_PARA == nType ) - nFlagType |= SVX_SHOW_PARACTL; - if( SFX_STYLE_FAMILY_CHAR != nType ) - nFlagType |= SVX_SHOW_SELECTOR; - if( SFX_STYLE_FAMILY_FRAME == nType ) - nFlagType |= SVX_ENABLE_TRANSPARENCY; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER)); + rPage.PageCreated(aSet); + } + } + else if (nId == m_nIndentsId) + { + if( rPage.GetItemSet().GetParent() ) + { + aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,MM50/10)); + aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,0x000F)); rPage.PageCreated(aSet); } - break; - case TP_CONDCOLL: - ((SwCondCollPage&)rPage).SetCollection( - ((SwDocStyleSheet&)GetStyleSheet()).GetCollection(), bNewStyle ); - break; - case TP_PAGE_STD: - if(0 == (nHtmlMode & HTMLMODE_ON )) + } + else if (nId == m_nOutlineId) + { + //-->#outlinelevel added by zhaojianwei + // handle if the current paragraph style is assigned to a list level of outline style, + SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() ); + if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() ) + { + ((SwParagraphNumTabPage&)rPage).DisableOutline() ; + ((SwParagraphNumTabPage&)rPage).DisableNumbering(); + }//<-end + ListBox & rBox = ((SwParagraphNumTabPage&)rPage).GetStyleBox(); + SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); + const SfxStyleSheetBase* pBase = pPool->First(); + std::set<String> aNames; + while(pBase) + { + aNames.insert(pBase->GetName()); + pBase = pPool->Next(); + } + for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it) + rBox.InsertEntry(*it); + } + else if (nId == m_nAlignId) + { + aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); + rPage.PageCreated(aSet); + } + else if (nId == m_nTypeId) + { + ((SwFrmPage&)rPage).SetNewFrame( sal_True ); + ((SwFrmPage&)rPage).SetFormatUsed( sal_True ); + } + else if (nId == m_nOptionsId) + { + ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True); + ((SwFrmAddPage&)rPage).SetNewFrame(sal_True); + } + else if (nId == m_nWrapId) + { + ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False ); + } + else if (nId == m_nColumnId) + { + if( nType == SFX_STYLE_FAMILY_FRAME ) + ((SwColumnPage&)rPage).SetFrmMode(sal_True); + ((SwColumnPage&)rPage).SetFormatUsed( sal_True ); + } + else if (nId == m_nBackgroundId) + { + sal_Int32 nFlagType = 0; + if( SFX_STYLE_FAMILY_PARA == nType ) + nFlagType |= SVX_SHOW_PARACTL; + if( SFX_STYLE_FAMILY_CHAR != nType ) + nFlagType |= SVX_SHOW_SELECTOR; + if( SFX_STYLE_FAMILY_FRAME == nType ) + nFlagType |= SVX_ENABLE_TRANSPARENCY; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + rPage.PageCreated(aSet); + } + else if (nId == m_nConditionId) + { + ((SwCondCollPage&)rPage).SetCollection( + ((SwDocStyleSheet&)GetStyleSheet()).GetCollection(), bNewStyle ); + } + else if (nId == m_nPageId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + { + std::vector<OUString> aList; + OUString aNew; + SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew ); + aList.push_back( aNew ); + if( pWrtShell ) { - std::vector<OUString> aList; - OUString aNew; - SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew ); - aList.push_back( aNew ); - if( pWrtShell ) + SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> + GetView().GetDocShell()->GetStyleSheetPool(); + pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); + SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(); + while(pFirstStyle) { - SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> - GetView().GetDocShell()->GetStyleSheetPool(); - pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); - SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(); - while(pFirstStyle) - { - aList.push_back( pFirstStyle->GetName() ); - pFirstStyle = pStyleSheetPool->Next(); - } + aList.push_back( pFirstStyle->GetName() ); + pFirstStyle = pStyleSheetPool->Next(); } - aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); - rPage.PageCreated(aSet); } - break; - - case TP_MACRO_ASSIGN: - { - SfxAllItemSet aNewSet(*aSet.GetPool()); - aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) ); - if ( pWrtShell ) - rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); - rPage.PageCreated(aNewSet); - break; + aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); + rPage.PageCreated(aSet); } + } + else if (nId == m_nMacroId) + { + SfxAllItemSet aNewSet(*aSet.GetPool()); + aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) ); + if ( pWrtShell ) + rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); + rPage.PageCreated(aNewSet); + } + else if (nId == m_nNumId) + { + aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + rPage.PageCreated(aSet); + } + else if (nId == m_nNumOptId) + { - case RID_SVXPAGE_PICK_NUM: - { - aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - rPage.PageCreated(aSet); - } - break; - case RID_SVXPAGE_NUM_OPTIONS: - { - - aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - // collect character styles - ListBox rCharFmtLB(this); - rCharFmtLB.Clear(); - rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); - SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); - ::FillCharStyleListBox(rCharFmtLB, pDocShell); - - std::vector<OUString> aList; - for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) - aList.push_back( rCharFmtLB.GetEntry(j) ); + aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt)); + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + // collect character styles + ListBox rCharFmtLB(this); + rCharFmtLB.Clear(); + rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); + SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); + ::FillCharStyleListBox(rCharFmtLB, pDocShell); + + std::vector<OUString> aList; + for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) + aList.push_back( rCharFmtLB.GetEntry(j) ); + + aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; + FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); + rPage.PageCreated(aSet); + } + else if (nId == m_nNumPosId) + { + SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); + FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; - FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); - rPage.PageCreated(aSet); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); + rPage.PageCreated(aSet); + } + else if (nId == m_nBulletId) + { + aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); + rPage.PageCreated(aSet); + } + else if (nId == m_nHeaderId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + ((SvxHeaderPage&)rPage).EnableDynamicSpacing(); + } + else if (nId == m_nFooterId) + { + if(0 == (nHtmlMode & HTMLMODE_ON )) + ((SvxFooterPage&)rPage).EnableDynamicSpacing(); + } + else if (nId == m_nBorderId) + { + if( SFX_STYLE_FAMILY_PARA == nType ) + { + aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_PARA)); } - break; - case RID_SVXPAGE_NUM_POSITION: + else if( SFX_STYLE_FAMILY_FRAME == nType ) { - SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); - FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); - rPage.PageCreated(aSet); + aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); } - break; - case RID_SVXPAGE_PICK_BULLET : - { - aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); - rPage.PageCreated(aSet); - } - break; - case TP_HEADER_PAGE: - if(0 == (nHtmlMode & HTMLMODE_ON )) - ((SvxHeaderPage&)rPage).EnableDynamicSpacing(); - break; - case TP_FOOTER_PAGE: - if(0 == (nHtmlMode & HTMLMODE_ON )) - ((SvxFooterPage&)rPage).EnableDynamicSpacing(); - break; - case TP_BORDER : - if( SFX_STYLE_FAMILY_PARA == nType ) - { - aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_PARA)); - } - else if( SFX_STYLE_FAMILY_FRAME == nType ) - { - aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); - } - rPage.PageCreated(aSet); - - break; + rPage.PageCreated(aSet); } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src deleted file mode 100644 index 0a6ae79e43c7..000000000000 --- a/sw/source/ui/fmtui/tmpdlg.src +++ /dev/null @@ -1,373 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sfx2/sfx.hrc> -#include "fmtui.hrc" -#include "globals.hrc" -#include "svx/dialogs.hrc" -TabDialog DLG_TEMPLATE_1 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Character Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_CHAR_STD ; - Text [ en-US ] = "Font" ; - PageResID = TP_CHAR_STD ; - }; - PageItem - { - Identifier = TP_CHAR_EXT ; - Text [ en-US ] = "Font Effects" ; - PageResID = TP_CHAR_EXT ; - }; - PageItem - { - Identifier = TP_CHAR_POS ; - PageResID = TP_CHAR_POS ; - Text [ en-US ] = "Position"; - }; - PageItem - { - Identifier = TP_CHAR_TWOLN ; - PageResID = TP_CHAR_TWOLN; - Text [ en-US ] = "Asian Layout"; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_2 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Paragraph Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_PARA_STD ; - Text [ en-US ] = "Indents & Spacing" ; - PageResID = TP_PARA_STD ; - }; - PageItem - { - Identifier = TP_PARA_ALIGN ; - PageResID = TP_PARA_ALIGN ; - Text [ en-US ] = "Alignment" ; - }; - PageItem - { - Identifier = TP_PARA_EXT ; - Text [ en-US ] = "Text Flow" ; - PageResID = TP_PARA_EXT ; - }; - PageItem - { - Identifier = TP_PARA_ASIAN; - Text [ en-US ] = "Asian Typography"; - }; - PageItem - { - Identifier = TP_CHAR_STD ; - Text [ en-US ] = "Font" ; - PageResID = TP_CHAR_STD ; - }; - PageItem - { - Identifier = TP_CHAR_EXT ; - Text [ en-US ] = "Font Effects" ; - PageResID = TP_CHAR_EXT ; - }; - PageItem - { - Identifier = TP_CHAR_POS ; - PageResID = TP_CHAR_POS ; - Text [ en-US ] = "Position"; - }; - PageItem - { - Identifier = TP_CHAR_TWOLN ; - PageResID = TP_CHAR_TWOLN; - Text [ en-US ] = "Asian Layout"; - }; - PageItem - { - Identifier = TP_NUMPARA ; - Text [ en-US ] = "Outline & Numbering" ; - }; - PageItem - { - Identifier = TP_TABULATOR ; - Text [ en-US ] = "Tabs" ; - PageResID = TP_TABULATOR ; - }; - PageItem - { - Identifier = TP_DROPCAPS ; - Text [ en-US ] = "Drop Caps" ; - PageResID = TP_DROPCAPS ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_CONDCOLL ; - PageResID = TP_CONDCOLL ; - Text [ en-US ] = "Condition" ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_4 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - // Text[norwegian_wrong] = "Sidetyper"; - // Text[italian_wrong] = "Stili pagina"; - // Text[portuguese_brazilian_wrong] = "Estilos da Página "; - // Text[portuguese_wrong] = "Estilos da Página "; - // Text[finnish_wrong] = "Sivutyylit"; - // Text[danish_wrong] = "Sidelayout"; - // Text[french_wrong] = "Styles de page"; - // Text[swedish_wrong] = "Sidformat"; - // Text[dutch_wrong] = "Pagina-opmaakprofielen"; - // Text[spanish_wrong] = "Estilos de página"; - Text [ en-US ] = "Page Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - /* PageItem - { - Identifier = TP_PAGE_STD ; - Text [ en-US ] = "Page" ; - PageResID = TP_PAGE_STD ; - };*/ - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - /* PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_HEADER_PAGE ; - Text [ en-US ] = "Header" ; - PageResID = TP_HEADER_PAGE ; - }; - PageItem - { - Identifier = TP_FOOTER_PAGE ; - Text [ en-US ] = "Footer" ; - PageResID = TP_FOOTER_PAGE ; - }; - PageItem - { - Identifier = TP_COLUMN ; - Text [ en-US ] = "Columns" ; - PageResID = TP_COLUMN ; - }; - PageItem - { - Identifier = TP_FOOTNOTE_PAGE ; - Text [ en-US ] = "Footnote" ; - PageResID = TP_FOOTNOTE_PAGE ; - };*/ - }; - }; -}; -String STR_PAGE_STD -{ - Text [ en-US ] = "Page" ; -}; -String STR_PAGE_BORDER -{ - Text [ en-US ] = "Borders" ; -}; -String STR_PAGE_HEADER -{ - Text [ en-US ] = "Header" ; -}; -String STR_PAGE_FOOTER -{ - Text [ en-US ] = "Footer" ; -}; -String STR_PAGE_TEXTGRID -{ - Text [ en-US ] = "Text Grid"; -}; -String STR_PAGE_COLUMN -{ - Text [ en-US ] = "Columns" ; -}; -String STR_PAGE_FOOTNOTE -{ - Text [ en-US ] = "Footnote" ; -}; -TabDialog DLG_TEMPLATE_3 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - // Text[norwegian_wrong] = "Rammemaler"; - // Text[italian_wrong] = "Stili cornice"; - // Text[portuguese_brazilian_wrong] = "Estilos de Moldura"; - // Text[portuguese_wrong] = "Estilos de Moldura"; - // Text[finnish_wrong] = "Kehystyylit"; - // Text[danish_wrong] = "Rammelayout"; - // Text[french_wrong] = "Styles d'encadrement"; - // Text[swedish_wrong] = "Ramformat"; - // Text[dutch_wrong] = "Kaderopmaakprofielen"; - // Text[spanish_wrong] = "Estilos de marco"; - Text [ en-US ] = "Frame Style" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_FRM_STD ; - Text [ en-US ] = "Type" ; - PageResID = TP_FRM_STD ; - }; - PageItem - { - Identifier = TP_FRM_ADD ; - PageResID = TP_FRM_ADD ; - Text [ en-US ] = "Options" ; - }; - PageItem - { - Identifier = TP_FRM_WRAP ; - Text [ en-US ] = "Wrap" ; - PageResID = TP_FRM_WRAP ; - }; - PageItem - { - Identifier = TP_BACKGROUND ; - Text [ en-US ] = "Background" ; - PageResID = TP_BACKGROUND ; - }; - PageItem - { - Identifier = TP_BORDER ; - Text [ en-US ] = "Borders" ; - PageResID = TP_BORDER ; - }; - PageItem - { - Identifier = TP_COLUMN ; - Text [ en-US ] = "Columns" ; - PageResID = TP_COLUMN ; - }; - PageItem - { - Identifier = TP_MACRO_ASSIGN ; - Text [ en-US ] = "Macro" ; - }; - }; - }; -}; -TabDialog DLG_TEMPLATE_5 -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - TabControl 1 - { - PageList = - { - PageItem - { - Identifier = RID_SVXPAGE_PICK_BULLET ; - Text [ en-US ] = "Bullets" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_SINGLE_NUM; - Text [ en-US ] = "Numbering Style" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_NUM ; - Text [ en-US ] = "Outline" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_PICK_BMP; - Text [ en-US ] = "Graphics" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_NUM_POSITION ; - Text [ en-US ] = "Position" ; - }; - PageItem - { - Identifier = RID_SVXPAGE_NUM_OPTIONS; - Text [ en-US ] = "Options" ; - }; - }; - }; - Text [ en-US ] = "Numbering Style" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx index 75ad5616a57a..e76c63117849 100644 --- a/sw/source/ui/inc/swuipardlg.hxx +++ b/sw/source/ui/inc/swuipardlg.hxx @@ -44,7 +44,7 @@ public: sal_uInt8 nDialogMode, const String *pCollName = 0, sal_Bool bDraw = sal_False, - sal_uInt16 nDefPage = 0); + OString sDefPage = OString()); ~SwParaDlg(); }; diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx index d66b208251f3..25ac34d01b34 100644 --- a/sw/source/ui/inc/tmpdlg.hxx +++ b/sw/source/ui/inc/tmpdlg.hxx @@ -37,18 +37,47 @@ class SwTemplateDlg: public SfxStyleDialog DECL_LINK( NumOptionsHdl, PushButton* ); + sal_uInt16 m_nIndentsId; + sal_uInt16 m_nAlignId; + sal_uInt16 m_nTextFlowId; + sal_uInt16 m_nAsianTypo; + sal_uInt16 m_nFontId; + sal_uInt16 m_nFontEffectId; + sal_uInt16 m_nPositionId; + sal_uInt16 m_nAsianLayoutId; + sal_uInt16 m_nTabId; + sal_uInt16 m_nOutlineId; + sal_uInt16 m_nDropCapsId; + sal_uInt16 m_nBackgroundId; + sal_uInt16 m_nBorderId; + sal_uInt16 m_nConditionId; + sal_uInt16 m_nTypeId; + sal_uInt16 m_nOptionsId; + sal_uInt16 m_nWrapId; + sal_uInt16 m_nColumnId; + sal_uInt16 m_nMacroId; + sal_uInt16 m_nHeaderId; + sal_uInt16 m_nFooterId; + sal_uInt16 m_nPageId; + sal_uInt16 m_nFootNoteId; + sal_uInt16 m_nTextGridId; + sal_uInt16 m_nSingleId; + sal_uInt16 m_nBulletId; + sal_uInt16 m_nNumId; + sal_uInt16 m_nBmpId; + sal_uInt16 m_nNumOptId; + sal_uInt16 m_nNumPosId; + public: - // @param nSlot - // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. - // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane + // @param sPage + // Identifies name of page to open at by default SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - const sal_uInt16 nSlot = 0, + OString sPage = OString(), SwWrtShell* pActShell = 0, - sal_Bool bNew = sal_False ); + bool bNew = false ); - ~SwTemplateDlg(); const SfxItemSet* GetRefreshedSet(); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index f76e11bf9812..d42d48d6dce7 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -252,7 +252,7 @@ SwTitlePageDlg::~SwTitlePageDlg() IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl) { SwView& rView = mpSh->GetView(); - rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), false, *mpSh); + rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); rView.InvalidateRulerPos(); return 0; diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 3c8ceeb2aed1..13da065de283 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -483,7 +483,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index b97027529ebe..87c393c4a667 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2343,10 +2343,20 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) // Temporary view, because the shell does not need to be valid after the dialogue // for example disable header SwView& rTempView = GetView(); + + OString sPageId; + switch (nSlot) + { + case FN_FORMAT_PAGE_COLUMN_DLG: + sPageId = "columns"; + break; + case FN_FORMAT_PAGE_SETTING_DLG: + sPageId = "page"; + break; + } + rTempView.GetDocShell()->FormatPage( - rPageDesc.GetName(), - nSlot, - rSh ); + rPageDesc.GetName(), sPageId, rSh); rTempView.InvalidateRulerPos(); } } diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 63684dc1bde3..24bdeb8d2d09 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -326,7 +326,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(TP_CHAR_EXT); + pDlg->SetCurPageId("fonteffect"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) 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; diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index aa6d41ce48f9..881eabf84c38 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -26,6 +26,7 @@ #include <svx/ruler.hxx> #include <editeng/lrspitem.hxx> #include <svl/srchitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <swmodule.hxx> #include <view.hxx> @@ -573,7 +574,7 @@ int SwView::KillVRuler() IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) { - sal_uInt16 nDefPage = 0; + OUString sDefPage; switch( pRuler->GetClickType() ) { case RULER_TYPE_DONTKNOW: @@ -581,14 +582,14 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) case RULER_TYPE_INDENT: case RULER_TYPE_MARGIN1: case RULER_TYPE_MARGIN2: - nDefPage = TP_PARA_STD; + sDefPage = "indents"; break; default: - nDefPage = TP_TABULATOR; + sDefPage = "tabs"; } - SfxUInt16Item aDefPage(SID_PARA_DLG, nDefPage); + SfxStringItem aDefPage(SID_PARA_DLG, sDefPage); GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aDefPage, 0L ); |