diff options
| author | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
| commit | 8a6f84ce896f41a7a1f97b06d1e053c51cbba95e (patch) | |
| tree | 0865afbfa9eb147e0a5be9759f932954cfb59e32 /sw/source/ui/fmtui | |
| parent | 59ee09f905e86724a2ba5cdccab9210d16686820 (diff) | |
resync to trunk (close to AOO400)
Diffstat (limited to 'sw/source/ui/fmtui')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index f5301f195511..941561f87b70 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -106,7 +106,7 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, - sal_Bool bColumn, + const sal_uInt16 nSlot, SwWrtShell* pActShell, sal_Bool bNew ) : SfxStyleDialog( pParent, @@ -260,15 +260,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); - // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen) -/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase. - GetItemSet().Get(RES_FRM_SIZE)); - if( !aSize.GetWidth() ) - { - aSize.SetWidth( DFLT_WIDTH ); - aSize.SetHeight( DFLT_HEIGHT ); - rBase.GetItemSet().Put( aSize ); - }*/ break; } // Seitenvorlagen @@ -283,8 +274,14 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)), SvxFooterPage::Create, SvxFooterPage::GetRanges ); - if(bColumn) + if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG ) + { SetCurPageId(TP_COLUMN); + } + else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG ) + { + SetCurPageId(TP_PAGE_STD); + } DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!"); DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!"); |